merge conflict resolution

Explains how AI resolves Git merge conflicts by interpreting code semantics, commit history, and tests rather than raw diffs. Describes LLM-based strategies to propose and rank merges, auto-fix common patterns, and justify changes with human-in-the-loop review. Covers CI/CD integration, guardrails, and metrics, plus challenges like hallucinations, context limits, and licensing.